From: Florian Müllner <fmuellner@gnome.org>
Date: Mon, 7 Nov 2011 23:17:33 +0000 (+0100)
Subject: main: Fix shell_dbus_acquire_names()
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~7325
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=2b6c5bb4168b29f885cfecd7b16b19d12cde4d62;p=gnome-shell.git

main: Fix shell_dbus_acquire_names()

Commit 39727d1156 refactored dbus acquisition, but due to wrong use
of va_args we would only ever acquire the first bus name passed.

https://bugzilla.gnome.org/show_bug.cgi?id=658078
---

diff --git a/src/main.c b/src/main.c
index f759d23a8..d8cdff5b2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -61,19 +61,17 @@ static void
 shell_dbus_acquire_names (DBusGProxy *bus,
                           guint32     request_name_flags,
                           gchar      *name,
-                          gboolean    fatal,
-                          gchar      *other, ...) G_GNUC_NULL_TERMINATED;
+                          gboolean    fatal, ...) G_GNUC_NULL_TERMINATED;
 
 static void
 shell_dbus_acquire_names (DBusGProxy *bus,
                           guint32     request_name_flags,
                           gchar      *name,
-                          gboolean    fatal,
-                          gchar      *other, ...)
+                          gboolean    fatal, ...)
 {
   va_list al;
   guint32 request_name_result;
-  va_start (al, other);
+  va_start (al, fatal);
   for (;;)
   {
     shell_dbus_acquire_name (bus,